Added support for wheel mice (buttons 4 and 5).

Sun Nov 21 16:44:35 1999  Stefan Jeske  <stefan@gtk.org>

        * gtk/gtkspinbutton.c (gtk_spin_button_button_press): Added support
        for wheel mice (buttons 4 and 5).

diff --git a/ChangeLog b/ChangeLog
index 5642940c777433624c54c37cce330b05b4c17e42..f5dc4c12b89eca32b6a924dcf7abe7e63eda717d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov 21 16:44:35 1999  Stefan Jeske  <stefan@gtk.org>
+
+        * gtk/gtkspinbutton.c (gtk_spin_button_button_press): Added support 
+        for wheel mice (buttons 4 and 5).
+
 1999-11-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkgc-win32.c (gdk_gc_predraw): Also for truecolor

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5642940c777433624c54c37cce330b05b4c17e42..f5dc4c12b89eca32b6a924dcf7abe7e63eda717d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Sun Nov 21 16:44:35 1999  Stefan Jeske  <stefan@gtk.org>
+
+        * gtk/gtkspinbutton.c (gtk_spin_button_button_press): Added support 
+        for wheel mice (buttons 4 and 5).
+
 1999-11-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkgc-win32.c (gdk_gc_predraw): Also for truecolor

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5642940c777433624c54c37cce330b05b4c17e42..f5dc4c12b89eca32b6a924dcf7abe7e63eda717d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Nov 21 16:44:35 1999  Stefan Jeske  <stefan@gtk.org>
+
+        * gtk/gtkspinbutton.c (gtk_spin_button_button_press): Added support 
+        for wheel mice (buttons 4 and 5).
+
 1999-11-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkgc-win32.c (gdk_gc_predraw): Also for truecolor

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5642940c777433624c54c37cce330b05b4c17e42..f5dc4c12b89eca32b6a924dcf7abe7e63eda717d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sun Nov 21 16:44:35 1999  Stefan Jeske  <stefan@gtk.org>
+
+        * gtk/gtkspinbutton.c (gtk_spin_button_button_press): Added support 
+        for wheel mice (buttons 4 and 5).
+
 1999-11-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkgc-win32.c (gdk_gc_predraw): Also for truecolor

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5642940c777433624c54c37cce330b05b4c17e42..f5dc4c12b89eca32b6a924dcf7abe7e63eda717d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Nov 21 16:44:35 1999  Stefan Jeske  <stefan@gtk.org>
+
+        * gtk/gtkspinbutton.c (gtk_spin_button_button_press): Added support 
+        for wheel mice (buttons 4 and 5).
+
 1999-11-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkgc-win32.c (gdk_gc_predraw): Also for truecolor

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5642940c777433624c54c37cce330b05b4c17e42..f5dc4c12b89eca32b6a924dcf7abe7e63eda717d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Nov 21 16:44:35 1999  Stefan Jeske  <stefan@gtk.org>
+
+        * gtk/gtkspinbutton.c (gtk_spin_button_button_press): Added support 
+        for wheel mice (buttons 4 and 5).
+
 1999-11-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkgc-win32.c (gdk_gc_predraw): Also for truecolor

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5642940c777433624c54c37cce330b05b4c17e42..f5dc4c12b89eca32b6a924dcf7abe7e63eda717d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Nov 21 16:44:35 1999  Stefan Jeske  <stefan@gtk.org>
+
+        * gtk/gtkspinbutton.c (gtk_spin_button_button_press): Added support 
+        for wheel mice (buttons 4 and 5).
+
 1999-11-18  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkgc-win32.c (gdk_gc_predraw): Also for truecolor

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 7429efdb1a4622a6d557b488ed7ea5058aff7138..162f63588e7fbf604e375c3cc7c100186ff9cf82 100644 (file)
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -45,6 +45,8 @@
 #define MAX_TEXT_LENGTH                    256
 #define MAX_TIMER_CALLS                    5
 #define EPSILON                            1e-5
+#define WHEEL_UP_BUTTON                    4
+#define WHEEL_DOWN_BUTTON                  5
 
 enum {
   ARG_0,
@@ -763,7 +765,19 @@ gtk_spin_button_button_press (GtkWidget      *widget,
 
   if (!spin->button)
     {
-      if (event->window == spin->panel)
+      if (event->button == WHEEL_UP_BUTTON)
+       {
+         if (!GTK_WIDGET_HAS_FOCUS (widget))
+           gtk_widget_grab_focus (widget);
+         gtk_spin_button_real_spin (spin, spin->adjustment->step_increment);
+       }
+      else if (event->button == WHEEL_DOWN_BUTTON)
+       {
+         if (!GTK_WIDGET_HAS_FOCUS (widget))
+           gtk_widget_grab_focus (widget);
+         gtk_spin_button_real_spin (spin, -spin->adjustment->step_increment); 
+       }
+      else if (event->window == spin->panel)
        {
          if (!GTK_WIDGET_HAS_FOCUS (widget))
            gtk_widget_grab_focus (widget);